Auto merge of #4238 - ashleygwilliams:policies, r=steveklabnik
authorbors <bors@rust-lang.org>
Thu, 29 Jun 2017 18:31:16 +0000 (18:31 +0000)
committerbors <bors@rust-lang.org>
Thu, 29 Jun 2017 18:31:16 +0000 (18:31 +0000)
updates to policies

based on convo with @withoutboats and @carols10cents


Trivial merge